*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 1313293b745056520354f8d794d385fecdd49df3..95a520c44368026dfadce90ec78ddec1bd8e2337 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Include io.h on windows.  (#156075,
+       Kazuki IWAMOTO)
+       (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't
+       have mmap.
+
        * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for
        cached themes.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1313293b745056520354f8d794d385fecdd49df3..95a520c44368026dfadce90ec78ddec1bd8e2337 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Include io.h on windows.  (#156075,
+       Kazuki IWAMOTO)
+       (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't
+       have mmap.
+
        * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for
        cached themes.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1313293b745056520354f8d794d385fecdd49df3..95a520c44368026dfadce90ec78ddec1bd8e2337 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Include io.h on windows.  (#156075,
+       Kazuki IWAMOTO)
+       (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't
+       have mmap.
+
        * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for
        cached themes.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1313293b745056520354f8d794d385fecdd49df3..95a520c44368026dfadce90ec78ddec1bd8e2337 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Include io.h on windows.  (#156075,
+       Kazuki IWAMOTO)
+       (_gtk_icon_cache_new_for_path): Don't use MAP_FAILED if we don't
+       have mmap.
+
        * gtk/gtkicontheme.c (gtk_icon_theme_has_icon): Implement for
        cached themes.
 

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 5175787c7c9dac6fa08e536ebe7c18476a3f715b..03f6f3bf440ab796c295a15998dae52fb292ea23 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -24,7 +24,9 @@
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #endif
-
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
@@ -72,12 +74,13 @@ _gtk_icon_cache_unref (GtkIconCache *cache)
 GtkIconCache *
 _gtk_icon_cache_new_for_path (const gchar *path)
 {
+  GtkIconCache *cache = NULL;
+#ifdef HAVE_MMAP
   gchar *cache_filename;
   gint fd;
   struct stat st;
   struct stat path_st;
-  gchar *buffer = MAP_FAILED;
-  GtkIconCache *cache = NULL;
+  gchar *buffer;
 
   if (g_getenv ("GTK_NO_ICON_CACHE"))
     return NULL;
@@ -114,9 +117,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
       goto done; 
     }
 
-#ifdef HAVE_MMAP
   buffer = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-#endif
 
   if (buffer == MAP_FAILED)
     goto done;
@@ -125,9 +126,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   if (GET_UINT16 (buffer, 0) != MAJOR_VERSION ||
       GET_UINT16 (buffer, 2) != MINOR_VERSION)
     {
-#ifdef HAVE_MMAP
       munmap (buffer, st.st_size);
-#endif
       GTK_NOTE (ICONTHEME, 
                g_print ("wrong cache version\n"));
       goto done;
@@ -144,6 +143,8 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   g_free (cache_filename);  
   close (fd);
 
+#endif  /* HAVE_MMAP */
+
   return cache;
 }